Fixed Bug 554192 – deadkey-only compose sequences now working

svn path=/trunk/; revision=21613

diff --git a/ChangeLog b/ChangeLog
index 816e389ee8ebbeaf9f0ca0ae5acf89085420461b..90396d53bb75495cfdfff1b5038035dac34319e9 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,12 @@
+2008-10-09  Simos Xenitellis  <simos@gnome.org>
+
+       Bug 554192 – double press on the "circumflex" dead key 
+       (standard french 105 keyboard) no longer produces the "^" character
+
+       * gtk/gtkimcontextsimple.c (gtk_im_context_simple_filter_keypress):
+       Changed the order, put check_compact_table() first, then 
+       check_algorithmically().
+
 2008-10-08  Christian Persch  <chpe@gnome.org>
 
         Bug 554702 – gtkfilesystem leaks GError

diff --git a/gtk/gtkimcontextsimple.c b/gtk/gtkimcontextsimple.c
index a9eeb944baa9f7d1c02dbc2ce4f22043928266ee..967d30c48f5b0bd0654ffdd18f55ef244eaefc35 100644 (file)
--- a/gtk/gtkimcontextsimple.c
+++ b/gtk/gtkimcontextsimple.c
@@ -933,12 +933,12 @@ gtk_im_context_simple_filter_keypress (GtkIMContext *context,
             return TRUE;
           tmp_list = tmp_list->next;
         }
-  
-      if (check_algorithmically (context_simple, n_compose))
-       return TRUE;
 
       if (check_compact_table (context_simple, &gtk_compose_table_compact, n_compose))
         return TRUE;
+  
+      if (check_algorithmically (context_simple, n_compose))
+       return TRUE;
     }
   
   /* The current compose_buffer doesn't match anything */